From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 18 Aug 2010 23:32:39 +0000 (+0200)
Subject: lisp/ChangeLog: Remove merge markers.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~526
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=71eab1406625791cdc0f0be0f8741e1e26184f29;p=emacs.git

lisp/ChangeLog: Remove merge markers.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3c17922975..abe6dce43e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -73,7 +73,6 @@
 	(ctext-no-compositions): Doc fix.
 	(compound-text-with-extensions): Doc fix.
 
->>>>>>> MERGE-SOURCE
 2010-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* simple.el (exchange-dot-and-mark): Mark obsolete, finally.